commit 129351cf01fae402e01a7cf575568a3adf04727c
Author: chjm6 <[email protected]>
Date:   Thu Sep 29 23:23:24 2022 -0400

    Added project README

commit 54615f532c1983ce9e99677d9c2c4a7fca7f9af9
Author: chjm6 <[email protected]>
Date:   Thu Sep 29 22:51:09 2022 -0400

    Added meta tags

commit bdda3a99fff2f4b5d2d47fe6b41f7de334358d2d
Author: chjm6 <[email protected]>
Date:   Thu Sep 29 22:07:28 2022 -0400

    Added port listening message

commit 8f12151e736822b0a7482c50f67dfcc793ed56f9
Author: chjm6 <[email protected]>
Date:   Thu Sep 29 21:49:43 2022 -0400

    Restored environment port var

commit 7159d4fdd51b665f37be4826e3e0d48ff7ebea5d
Author: chjm6 <[email protected]>
Date:   Thu Sep 29 21:07:07 2022 -0400

    User login functionality

commit b8325eba2fbca0a858b19d868c756c20f2d9a45d
Author: chjm6 <[email protected]>
Date:   Thu Sep 29 19:18:24 2022 -0400

    Started trying to use passport

commit 7db0c5e28cdb8ba28780252c6b5ac8bf77b3eb38
Author: chjm6 <[email protected]>
Date:   Thu Sep 29 17:14:56 2022 -0400

    Added deleting functionality

commit a7b04bca0be5f8210aa4021650774ebc431de33d
Author: chjm6 <[email protected]>
Date:   Thu Sep 29 16:00:00 2022 -0400

    Client js changes addendum - forgot in last commit

commit 758a798785ef1221801e3d886a12859ffce0dc66
Author: chjm6 <[email protected]>
Date:   Thu Sep 29 11:43:20 2022 -0400

    Server syncs without db

commit 6a6a628a8da31e3db5d405b7ff2b858b5be40583
Author: CJACOBSON32 <[email protected]>
Date:   Tue Sep 27 20:18:47 2022 -0400

    Progress on server interaction

commit 07785e5a9222c7bad9b15b57f66eba4c947316a4
Author: CJACOBSON32 <[email protected]>
Date:   Mon Sep 26 13:10:56 2022 -0400

    Implemented post request for path

commit 78b03733e58add0b57ceff7437a947bbacc4dc03
Author: chjm6 <[email protected]>
Date:   Mon Sep 26 11:41:45 2022 -0400

    Moved to mongodb.config.json

commit 2fbc63fe66390a24a726cea54225ddab15a96505
Author: chjm6 <[email protected]>
Date:   Mon Sep 26 11:30:47 2022 -0400

    Started server

commit a53a3aeb3c43f4dd3bf0a37ae11dd6171ddeda33
Author: chjm6 <[email protected]>
Date:   Mon Sep 26 02:24:46 2022 -0400

    Debugged canvas and implemented drawing

commit ed11c50951b768e767cfabd23f838a53e0fd2114
Author: chjm6 <[email protected]>
Date:   Sun Sep 25 19:18:38 2022 -0400

    Took way too long to fix bug with Paper js

commit 1b25ea0655a2c5a1ead233564ee235835d31310a
Author: CJACOBSON32 <[email protected]>
Date:   Tue Sep 20 11:49:45 2022 -0400

    Small switch to canvas

commit 32ebde0c4b4285d12db8ce584625f16da184b1c1
Author: CJACOBSON32 <[email protected]>
Date:   Tue Sep 20 11:40:16 2022 -0400

    Added project packages and renamed to Inkboard

commit 79da9d143a81bc0a773d458a7c8ef2c5e8b7333f
Author: CJACOBSON32 <[email protected]>
Date:   Mon Sep 19 14:39:49 2022 -0400

    Added webpack

commit 5d5e080bc75ebe04f62284f8a3673fc2a4cf7b61
Author: CJACOBSON32 <[email protected]>
Date:   Mon Sep 19 14:27:10 2022 -0400

    Implemented basic express server

    Also changed some names in index.html

commit 3605a1a4e55ed6dc4ffab187835fd71dd2e7a479
Author: CJACOBSON32 <[email protected]>
Date:   Thu Sep 15 12:36:31 2022 -0400

    Squashed commit of the following:

    commit a111be513d8e0efd8453c65b0469828099a12403
    Author: chjm6 <[email protected]>
    Date:   Sat Sep 10 13:57:55 2022 -0400

        Made chat auto-scroll to the bottom

    commit e9bd849e3ef965cac35180c6bc3450faf8b3f525
    Author: chjm6 <[email protected]>
    Date:   Thu Sep 8 23:02:12 2022 -0400

        Added evaluations

    commit 1ef3428e1412c907e093f9385dd8b3efd3fff35c
    Author: chjm6 <[email protected]>
    Date:   Thu Sep 8 17:57:55 2022 -0400

        Small update to README.md

    commit b8746126b883cfc835d1b58def78cc328b151e45
    Author: chjm6 <[email protected]>
    Date:   Thu Sep 8 16:15:31 2022 -0400

        Added README, added server logging, and made client refresh for new messages.

    commit 548043109a1b23f6113fa2e8290d2e4bc05313b0
    Author: chjm6 <[email protected]>
    Date:   Thu Sep 8 14:30:05 2022 -0400

        Made submitting the form clear the textbox

    commit 01be48c80cca87fb7f7d97af6596ade4771a0d75
    Author: chjm6 <[email protected]>
    Date:   Thu Sep 8 14:02:06 2022 -0400

        Made chat window auto-adjust height based on screen size

    commit 954864be50a25f56105f78f613ca1738e9980922
    Author: chjm6 <[email protected]>
    Date:   Thu Sep 8 13:04:38 2022 -0400

        Moved messages over to database

    commit 7e7a981bbe2c7bc0dcdf59f0f3dc49ab6cf8ce8c
    Author: chjm6 <[email protected]>
    Date:   Thu Sep 8 11:52:15 2022 -0400

        Basic chatting functionality implemented

    commit b6b1bdb42bfc6d02d7f82d915014c9cd5241dc7d
    Author: chjm6 <[email protected]>
    Date:   Thu Sep 8 01:41:08 2022 -0400

        Stuck on GET request

    commit 484a7d39a5379aac1fa76ed9ea9eec9835476646
    Author: chjm6 <[email protected]>
    Date:   Wed Sep 7 21:53:18 2022 -0400

        Basic server response

    commit cb13847808981e1d14eaf267725d51370a0c4963
    Author: chjm6 <[email protected]>
    Date:   Wed Sep 7 20:46:23 2022 -0400

        Set up Typescript

    commit 722148872f6a3d6c49ec8077d3c977c3600cb572
    Author: chjm6 <[email protected]>
    Date:   Sun Sep 4 14:51:30 2022 -0400

        Added some npm dependencies, switched to typescript, and reformatted code

    commit cc1d12f81bcf09974ab523dd09aa1bb06e26f0c7
    Merge: 5e7739a 640e6ed
    Author: CJACOBSON32 <[email protected]>
    Date:   Sun Sep 4 14:28:34 2022 -0400

        Merge branch 'cs4241-22a:main' into main

    commit 640e6ed4c8fed17fd999f5ab9fcf007c5b512785
    Author: charlie roberts <[email protected]>
    Date:   Thu Sep 1 17:54:50 2022 -0400

        Update README.md

    commit 5e7739a8204f500240191a2c11a4f2eb3b006d4c
    Author: CJACOBSON32 <[email protected]>
    Date:   Thu Sep 1 13:17:53 2022 -0400

        Added boilerplate .gitignore and ran npm install

    commit 581ffd08b82b2992c38ed32d4c653e3e1e49da48
    Author: charlie roberts <[email protected]>
    Date:   Mon Aug 29 10:37:15 2022 -0400

        Update README.md

    commit 6362c3c00ba2a2621ac78e6e47d8974d59ba5482
    Author: charlie roberts <[email protected]>
    Date:   Mon Aug 29 10:31:16 2022 -0400

        init

    # Conflicts:
    #	.gitignore
    #	.idea/modules.xml
    #	README.md
    #	package-lock.json
    #	package.json

commit 6df6fa3a47c20f0399b028e161a57ebd4222d1a2
Author: CJACOBSON32 <[email protected]>
Date:   Thu Sep 15 12:17:09 2022 -0400

    initialized node project

commit 24dc783bc59cef08325266d0919bda45587a2034
Author: charlie roberts <[email protected]>
Date:   Mon Sep 12 08:49:20 2022 -0700

    Update README.md

commit 1618a09e8bacfe15c7939f450077e918828845c4
Author: charlie roberts <[email protected]>
Date:   Mon Sep 12 08:48:35 2022 -0700

    Initial commit

# Conflicts:
#	.idea/.gitignore
#	.idea/modules.xml
#	README.md

Also some slight tweaks to .gitignore